From aae9a7198663d245c68722b78630a6648567b378 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Kristian=20H=C3=B8gsberg?= <krh@bitplanet.net>
Date: Sun, 29 Jan 2012 07:15:12 -0500
Subject: [PATCH] wayland: Also synthesize a configure event from
 gdk_window_wayland_move_resize

---
 gdk/wayland/gdkprivate-wayland.h |  4 ---
 gdk/wayland/gdkwindow-wayland.c  | 57 ++++++++++++++++++--------------
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/gdk/wayland/gdkprivate-wayland.h b/gdk/wayland/gdkprivate-wayland.h
index 68b81d66b3..f680759baf 100644
--- a/gdk/wayland/gdkprivate-wayland.h
+++ b/gdk/wayland/gdkprivate-wayland.h
@@ -45,10 +45,6 @@
 #define GDK_WINDOW_IS_WAYLAND(win)    (GDK_IS_WINDOW_IMPL_WAYLAND (((GdkWindow *)win)->impl))
 
 GType _gdk_wayland_window_get_type    (void);
-void  _gdk_wayland_window_update_size (GdkWindow *window,
-				       int32_t width,
-				       int32_t height,
-				       uint32_t edges);
 void _gdk_wayland_window_add_focus    (GdkWindow *window);
 void _gdk_wayland_window_remove_focus (GdkWindow *window);
 
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index ba3788c1b9..5cab6f56b8 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -157,15 +157,15 @@ _gdk_wayland_window_remove_focus (GdkWindow *window)
 }
 
 /**
- * _gdk_wayland_window_update_size:
+ * gdk_wayland_window_update_size:
  * @drawable: a #GdkDrawableImplWayland.
  * 
  * Updates the state of the drawable (in particular the drawable's
  * cairo surface) when its size has changed.
  **/
-void
-_gdk_wayland_window_update_size (GdkWindow *window,
-				 int32_t width, int32_t height, uint32_t edges)
+static void
+gdk_wayland_window_update_size (GdkWindow *window,
+				int32_t width, int32_t height, uint32_t edges)
 {
   GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
   GdkRectangle area;
@@ -436,6 +436,33 @@ gdk_wayland_window_ref_cairo_surface (GdkWindow *window)
   return impl->cairo_surface;
 }
 
+static cairo_surface_t *
+gdk_wayland_window_configure (GdkWindow *window,
+			      int width, int height, int edges)
+{
+  GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
+  GdkDisplay *display;
+  GdkEvent *event;
+
+  display = gdk_window_get_display (window);
+
+  /* TODO: Only generate a configure event if width or height have actually
+   * changed?
+   */
+  event = gdk_event_new (GDK_CONFIGURE);
+  event->configure.window = window;
+  event->configure.send_event = FALSE;
+  event->configure.width = width;
+  event->configure.height = height;
+
+  _gdk_window_update_size (window);
+  gdk_wayland_window_update_size (window, width, height, edges);
+
+  g_object_ref(window);
+
+  _gdk_wayland_display_deliver_event (display, event);
+}
+
 static void
 gdk_wayland_window_set_user_time (GdkWindow *window, guint32 user_time)
 {
@@ -477,10 +504,6 @@ shell_surface_handle_configure(void *data,
 {
   GdkWindow *window = GDK_WINDOW (data);
   GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
-  GdkDisplay *display;
-  GdkEvent *event;
-
-  display = gdk_window_get_display (window);
 
   gdk_window_constrain_size (&impl->geometry_hints,
                              impl->geometry_mask,
@@ -489,21 +512,7 @@ shell_surface_handle_configure(void *data,
                              &width,
                              &height);
 
-  /* TODO: Only generate a configure event if width or height have actually
-   * changed?
-   */
-  event = gdk_event_new (GDK_CONFIGURE);
-  event->configure.window = window;
-  event->configure.send_event = FALSE;
-  event->configure.width = width;
-  event->configure.height = height;
-
-  _gdk_window_update_size (window);
-  _gdk_wayland_window_update_size (window, width, height, edges);
-
-  g_object_ref(window);
-
-  _gdk_wayland_display_deliver_event (display, event);
+  gdk_wayland_window_configure (window, width, height, edges);
 }
 
 static const struct wl_shell_surface_listener shell_surface_listener = {
@@ -641,7 +650,7 @@ gdk_window_wayland_move_resize (GdkWindow *window,
    * just move the window - don't update its size
    */
   if (width > 0 && height > 0)
-    _gdk_wayland_window_update_size (window, width, height, 0);
+    gdk_wayland_window_configure (window, width, height, 0);
 }
 
 static void
-- 
2.30.2